From: Brion Vibber <brion@users.mediawiki.org>
Date: Mon, 14 Mar 2005 02:00:53 +0000 (+0000)
Subject: Don't force edit encoding when LanguageEo.php is loaded; defer until $wgContLang... 
X-Git-Tag: 1.5.0alpha1~619
X-Git-Url: http://git.cyclocoop.org/%28%5B%5E/404?a=commitdiff_plain;h=9ea27c314149f1686b40cd63c9d026068efcd8a4;p=lhc%2Fweb%2Fwiklou.git

Don't force edit encoding when LanguageEo.php is loaded; defer until $wgContLang initialization.
This makes editing work on other languages with UI language set to Esperanto in preferences.
---

diff --git a/includes/Setup.php b/includes/Setup.php
index f62fda03f3..a20d6ac71c 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -286,6 +286,7 @@ $wgContLanguageCode = $wgLanguageCode;
 $wgContLangClass = 'Language' . str_replace( '-', '_', ucfirst( $wgContLanguageCode ) );
 
 $wgContLang = setupLangObj( $wgContLangClass );
+$wgContLang->initEncoding();
 
 // set default user option from content language
 if( !$wgUser->mDataLoaded ) {
diff --git a/languages/Language.php b/languages/Language.php
index 3d49e7c6eb..7b5fe18cfa 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -2083,6 +2083,14 @@ class Language {
 		return $s[0];
 	}
 
+	function initEncoding() {
+		# Some languages may have an alternate char encoding option
+		# (Esperanto X-coding, Japanese furigana conversion, etc)
+		# If this language is used as the primary content language,
+		# an override to the defaults can be set here on startup.
+		#global $wgInputEncoding, $wgOutputEncoding, $wgEditEncoding;
+	}
+
 	function setAltEncoding() {
 		# Some languages may have an alternate char encoding option
 		# (Esperanto X-coding, Japanese furigana conversion, etc)
diff --git a/languages/LanguageEo.php b/languages/LanguageEo.php
index d931b305eb..2c118447be 100644
--- a/languages/LanguageEo.php
+++ b/languages/LanguageEo.php
@@ -1,8 +1,5 @@
 <?php
 require_once("LanguageUtf8.php");
-$wgInputEncoding	= "utf-8";
-$wgOutputEncoding	= "utf-8";
-$wgEditEncoding		= "x";
 
 # See language.doc
 
@@ -1140,13 +1137,20 @@ class LanguageEo extends LanguageUtf8 {
 		return $s;
 	}
 
+	function initEncoding() {
+		global $wgEditEncoding, $wgInputEncoding, $wgOutputEncoding;
+		$wgInputEncoding = "utf-8";
+		$wgOutputEncoding = "utf-8";
+		$wgEditEncoding = "x";
+	}
+
 	function setAltEncoding() {
 		global $wgEditEncoding, $wgInputEncoding, $wgOutputEncoding;
 		$wgInputEncoding = "utf-8";
 		$wgOutputEncoding = "x";
 		$wgEditEncoding = "";
 	}
-
+	
 }
 
 ?>